projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab76b1b
)
compose: Don't print trailing (null) if we skip committing
author
Colin Walters
<walters@verbum.org>
Sat, 25 Feb 2012 02:35:31 +0000
(21:35 -0500)
committer
Colin Walters
<walters@verbum.org>
Thu, 1 Mar 2012 21:08:27 +0000
(16:08 -0500)
If we skip a commit due to an idential content parent, we shouldn't
print the (null) commit checksum.
src/ostree/ot-builtin-compose.c
patch
|
blob
|
history
diff --git
a/src/ostree/ot-builtin-compose.c
b/src/ostree/ot-builtin-compose.c
index 5019dfa4541b027db9343248288793ffdac98311..48375e0d9046610b3fb96ca6954115a5d1a7e4fa 100644
(file)
--- a/
src/ostree/ot-builtin-compose.c
+++ b/
src/ostree/ot-builtin-compose.c
@@
-251,6
+251,8
@@
ostree_builtin_compose (int argc, char **argv, GFile *repo_path, GError **error)
if (!ostree_repo_write_ref (repo, NULL, branch, commit_checksum, error))
goto out;
+
+ g_print ("%s\n", commit_checksum);
}
else
{
@@
-263,7
+265,6
@@
ostree_builtin_compose (int argc, char **argv, GFile *repo_path, GError **error)
}
ret = TRUE;
- g_print ("%s\n", commit_checksum);
out:
if (in_transaction)
{